gtk: Add deprecation guards for newest pango deprecations

diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 1a90a226b741adaf9bf300b6aa8d0ac20bb86663..51044ebcb4de24a31b156b3c9b9fde09d7e5f448 100644 (file)
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -404,6 +404,7 @@ gtk_im_module_initialize (void)
       return;
     }
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   while (!have_error && pango_read_line (file, line_buf))
     {
       const char *p;
@@ -485,6 +486,7 @@ gtk_im_module_initialize (void)
          have_error = TRUE;
        }
     }
+G_GNUC_END_IGNORE_DEPRECATIONS
 
   if (have_error)
     {

diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 640be7bb55addf5953f5b42eed50146de9fec6b5..1af2c1dfe57ed3933eaf4290a92c0197a5ca58c5 100644 (file)
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -77,7 +77,9 @@ get_module_path (void)
 
   g_free (default_dir);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   result = pango_split_file_list (module_path);
+G_GNUC_END_IGNORE_DEPRECATIONS
   g_free (module_path);
 
   return result;
@@ -417,7 +419,9 @@ load_modules (const char *module_str)
 
   GTK_NOTE (MODULES, g_print ("Loading module list: %s\n", module_str));
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   module_names = pango_split_file_list (module_str);
+G_GNUC_END_IGNORE_DEPRECATIONS
   for (i = 0; module_names[i]; i++) 
     module_list = load_module (module_list, module_names[i]);
 

diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
index 58ebe5c2f8f2024f576cfa53b53cad1cff1be949..155be81a38f3ee797debfda8e2f1a1306a6a348a 100644 (file)
--- a/gtk/queryimmodules.c
+++ b/gtk/queryimmodules.c
@@ -190,7 +190,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 
       g_string_append_printf (contents, "# ModulesPath = %s\n#\n", path);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       dirs = pango_split_file_list (path);
+G_GNUC_END_IGNORE_DEPRECATIONS
       dirs_done = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
 
       for (i = 0; dirs[i]; i++)